From: Florian Müllner <fmuellner@gnome.org>
Date: Fri, 18 Oct 2024 15:22:04 +0000 (+0200)
Subject: build: Rename meson_options.txt to meson.options
X-Git-Tag: archive/raspbian/50.5-1+rpi1~1^2~173^2^2~200
X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/%22/%22http:/www.example.com/cgi/%22?a=commitdiff_plain;h=bf848a629a2901b5ae4dfffd381b022bc1cb4838;p=gnome-shell.git

build: Rename meson_options.txt to meson.options

The name is a bit cleaner, and has been the preferred option(!)
since meson 1.1.

Mutter recently updated the name, so follow suite.

The meson version bump shouldn't be an issue, given that several
hard dependencies like mutter and glib already require higher
versions.

Part-of: <https://gitlab.gnome.org/GNOME/gnome-shell/-/merge_requests/3515>
---

diff --git a/meson.build b/meson.build
index ea351eb4c..4dcd08494 100644
--- a/meson.build
+++ b/meson.build
@@ -1,6 +1,6 @@
 project('gnome-shell', 'c',
   version: '47.0',
-  meson_version: '>= 0.58.0',
+  meson_version: '>= 1.1.0',
   license: 'GPLv2+'
 )
 
diff --git a/meson.options b/meson.options
new file mode 100644
index 000000000..01e0d5803
--- /dev/null
+++ b/meson.options
@@ -0,0 +1,53 @@
+option('camera_monitor',
+  type: 'boolean',
+  value: true,
+  description: 'Enable the camera monitor'
+)
+
+option('extensions_tool',
+  type: 'boolean',
+  value: true,
+  description: 'Build gnome-extensions CLI tool'
+)
+
+option('extensions_app',
+  type: 'boolean',
+  value: true,
+  description: 'Build gnome-extensions GUI application'
+)
+
+option('gtk_doc',
+  type: 'boolean',
+  value: false,
+  description: 'Build API reference'
+)
+
+option('man',
+  type: 'boolean',
+  value: true,
+  description: 'Generate man pages'
+)
+
+option('tests',
+  type: 'boolean',
+  value: true,
+  description: 'Enable tests'
+)
+
+option('networkmanager',
+  type: 'boolean',
+  value: true,
+  description: 'Enable NetworkManager support'
+)
+
+option('portal_helper',
+  type: 'boolean',
+  value: true,
+  description: 'Enable build-in network portal login'
+)
+
+option('systemd',
+  type: 'boolean',
+  value: true,
+  description: 'Enable systemd integration'
+)
diff --git a/meson_options.txt b/meson_options.txt
deleted file mode 100644
index 01e0d5803..000000000
--- a/meson_options.txt
+++ /dev/null
@@ -1,53 +0,0 @@
-option('camera_monitor',
-  type: 'boolean',
-  value: true,
-  description: 'Enable the camera monitor'
-)
-
-option('extensions_tool',
-  type: 'boolean',
-  value: true,
-  description: 'Build gnome-extensions CLI tool'
-)
-
-option('extensions_app',
-  type: 'boolean',
-  value: true,
-  description: 'Build gnome-extensions GUI application'
-)
-
-option('gtk_doc',
-  type: 'boolean',
-  value: false,
-  description: 'Build API reference'
-)
-
-option('man',
-  type: 'boolean',
-  value: true,
-  description: 'Generate man pages'
-)
-
-option('tests',
-  type: 'boolean',
-  value: true,
-  description: 'Enable tests'
-)
-
-option('networkmanager',
-  type: 'boolean',
-  value: true,
-  description: 'Enable NetworkManager support'
-)
-
-option('portal_helper',
-  type: 'boolean',
-  value: true,
-  description: 'Enable build-in network portal login'
-)
-
-option('systemd',
-  type: 'boolean',
-  value: true,
-  description: 'Enable systemd integration'
-)